Start of a UI rewrite (WIP)