Wip/ui rewrite