More cleanup - navbar pared down, shortcode reference fixed