more controller refactoring and removing of extraneous views'