main form adjust
Merge remote-tracking branch 'origin/master' into Malstrom