UI tweaks complete