navbar wrapper, submenu and sublink issues fixed
Merge master conflicts fixed