Fixing more merge issues

View's had business logic and were bypassing the controllers. Fixed
that. Also fixed some bad merges.