Oranization template update

links provided by martyb.