Map and company view fixes
Navigation update
New static header