Fixed typos
Added navigation templates