Added form and css
Fixed merge conflicts