sync
Merge remote-tracking branch 'origin/chris' into jeff
sync
placing nav bar in grid
CB changes, reverted