Ui

Refactoring UI to Common UI Problems