WIP: Continue tweaking user interface