CLUB-633, 634, 636, 637, fixing several bugs for the modal, validation, etc
Merge pull request #687 from onepercentclub/feature/CLUB-633

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