[WIP] Refactor ui