more ui improvements WIP
last bits of the ui