Fixed models controller and added views