fixing up form layouts for fpr.