Templar v1.2

Nav issues fixed