Buttons to reveal shelves, better modularity