added controllers/converted to haml