Changed layout, fixed bug with required fields