Intermediate version after getting the book view

Minor clean up after getting the book view to work.