[WIP] Fix/mark required fields

mark required fields and refactor some forms by the way