Updated forms to be surrounded by header and footer.