Fixed theming bugs 1160-*
Margins fixed in header h2, menu restored.