Made changes to views and controllers