removed comments
refactored
moved view info from models to controller and added Jasmine unit tests