Fix header and sidebar layout, add nav-pills subnav and add variables to show/hide header/sidebar subnav