Updated proposal template and controller