Improve templates (title and nav)