Revert "Fixing template links to redirect properly"

This reverts commit 5aeb8d4b799b4d4c3fb8832aa04e6fbdeecaaabf.
Fixing template links