Fix manipulating form settings order where accidently the last setting was cut off
Minor variable renaming