Fixed navigation components markup to match the new version