Added form headers, refactored equipment form, segregated form links