Manual match form layout updated

Controls laid out/ aligned so it resizes well
Tab order modified to reflect the workflow