Shelf list in sidebar
more sidebar stuff
fixed merge issue