add navigation targets and menu
Merge branch 'development'