settings form improved