restructurung and nav highlighting
restructuring