Some UI stuff

UI chanes