How to re-design my form layout and design?