Typos, form type and layout fixed