Fixes for WetKit Navbar and commenting adjustments.
Issue #2353715 by omar: Fixed Alter hook prevents proper Feature revert.