Changes in settings page

Also starting changes in Wallet module