Moved redirect section to the template base