made some changes to controller, application view