Fixed settings form bugs