Changed p, a, g1 and g2 to big group
Merge remote-tracking branch 'origin/master' into gui
Fixed gui failing when clicking OK button multiple times (on validation errors).