Fixed error in highlighting current step in navigation menu.  Also
refactored the related methods.
Quick navigation works now.