Form Changes

Re-styled to match new and revised form inputs