Alphabetise
Replace HAML admin templates with ERB templates
Small fixes to inconsistencies from huge merge