#2 Adding more documentation for templates, rearranged menu items