Rework order form look.