Changes in general navigation, new template