lots of small UI fixed