New form without beautify and some bugs

BUT it is ready for CSS