Refactored settings to app