fixed rake tasks, added internal controller and layout