CLUB-633, 634, 636, 637, fixing several bugs for the modal, validation, ...

...etc