Merge remote-tracking branch 'upstream/master'
Made some fixes to the layout mechanisms of the global nav bar to make it work on iphone (basically getting back as much space as possible)
Merge pull request #71 from walmartlabs-asdaios/iphone/pull_nav_fixes

Iphone/pull nav fixes
Fixed a few little niggly things.
As per John's fix.