tidy up form, add semantics and styling