Changed structure of controller for consistency

Previous changes had changed the @majors and @dorms variables - it made sense for them all to be changed