More WIP on final UI polish