Improve form formatting [MJ-439]