Gp/1040

#1040 fixed plus some minor form layout corrections

Best regards,
Grzegorz