navigation directives works, some structure changes