merged updates for header and sidebar links
corrected module loading arrangement