[WIP] Refactor ui

Work in progress :exclamation: