Added new form markup
Fixed issues according to Daniil's comments