Made all controllers and view consistent in naming and structure