Fix load shelf

- Load shelf only in one place
- Minor cleanups