Theme and layout fixes