[Adam] changes to settings
[Adam] Progress on screens