update container and wrapper class + little html edit