[ui] Improve navigation