Updates

- Started to integrate functionality to hide content based on user
preferences
- Code tidy across several areas