More converting to HAML, SimpleForm and in general fixes.