Refactored, NavHelper added