Working on controllers and views