Added flexible links to template