overall theme layout fixes