took out map again
Merge branch 'left-nav'