Clean up some SQL
Fix page heading padding/margins