fixed remove listing button on bookshelf
fixed merge conflict