Made some changes on controllers and views