nav alignment issues -- commit before re-sync with master.