Chap 6, and fix nav-pills