Addings settings page and few basic modifications