Various changes in Global Nav and Quantity Control