Added headers, fixed some forms