Add Roger's change for settings layout