Major UI improvement for proposal