Added templating and navigation