several UI tweaks