Removed code from views and fixed controller code that failed due to merge