Reorganized templates. Added links to relevant pages