Fixed Bugs

Commitment problems with settingsScreen