Tweak UI
Tweak UI
WIP of refactoring
Refactor done