Move closing divs into jsp if statement
Clean up formatting on configuration pages
Merge 1.9 changes into Head