Refactor header|sidebar subnav