reorg nav and layout