Major UI refactoring