Update template filler and navigation links