Updates to the administration panel - moved includes to macros.html.