front-end wip
UI improvements