Iphone/pull nav fixes

Changes focused on optimizing space usage in the nav bar so it all fits on iPhone.