Cleaned up views. Moved many calls to controllers