Many fixes and features in the settings panel