Cleaned up views, need to fix up javascript