Pulling Ahmad's work with the Settings page