Initial cut at form elements; tidying up styling of pages