UI tweaks (new UI is pretty much done)