Nav Ring Fixes 3/3