Wip/ui refactoring