Major refactoring to controllers
Removed failed with errors
Removed useless views