Added more views, cleaned up JS