App Settings Fixes