Cleanup on Org/new, project_edit, OECD grant el calc
Fixed some issues from Alex's post