navigation restructured