Refactored Quick Settings