[MC] Salma merged more conflicts
[WIP] Salma fixed the form view