WIP of final UI polish