Fixed labels on RFP

also cleaned up