Minor sw600dp UI tweaks for better alignment