Fix shelf closing

- Fix shelf closing for non-premium users
- Cleanups