made some changes to controllers and some views