Minor changes: removing unnecessary views
Medium changes: adding templating