Adding routing and subnav control