fixed bug where deleting/modifying book list would break the add-to-list buttons
fixed merge conflicts