Create single error macro
Convert other benefit screens to use rps_form