Nav-line alignment fixes (firefox).
Fixed navline ampersand alignment.
Merged 2013-release1. Fixed nav-line alignment.