A lot of fixes for book view