A lot more work on converting everything to HAML and SimpleForm.