Added some functionality for settings page