Minor UI Changes, controller renaming for consistency's sake.