UI refactoring tmp commit (will be rebased/edited)
UI refactoring advancements, tmp commit (will be rebased/edited)