Layout adjustments; finished editing of form