UI and styling tweaks