Improved settings form