wip: UI redesign