Cleanining up and Fixing bug when bookshelf is 
empty.