Changed controllers to make public views