changes to books_controller
fix conflicts
fix conflicts
changes for merge
selection panels all the same