HTML tags added to require information in some imputs
Changes merged
Conflics fixed