Cleaned up views and controllers