some changes in modalities, there are some errors in create modality
refactor modality and create block
Merge branch 'bruno'