- Adding SystemSettings Listener ability
- Cleaning up System Settings page