updated for settings page