UI and UX Improvements

Surf/Surfices now sort by name in templates
Statuses still sort by id