Moving the template 
Changed icons
Changed template
Simple and full templates done