Tiny improvements in the form
Merging and Conflict resolving
Some form improvements and fixed a bug on the mobile navigation.