Cleaned up views, added more controller code.