Setting up new Form Handling and fix some markup and style bugs #2