fixing navigation UI issues