Added support for settings page