Fixing nav height
Merge branch '2014'