Added few comments in the settings
Reconnected switch
Removed duplicate settings + Notification from main thread