refactor form
Add some translations and markups