Theme and basic layout tweaks