Revert Navigation dimensions and bar/ring Master switch