Merge "Shrink the nav buttons some" into oc-dr1-dev