Restructured templates, added course review