Added new settings for the app + minor refactoring