Added header, footer, changed form labels