re-organized templates
re-organized templates
added some icons