UI refactoring
UI fixes
UI fixes