settings form improved

This PR improves the settings form.