2.1 version and site improvements