Cleaned up a few details

Disconnects settings widgets before connecting the newly selected widget