Refactoring

Cleaner implementation of Airplane vs Silent modes
Fixed text visibility issue

+ refactoring cleanup