Update forms styles and markup
Add sections 2 and 3