Updated css class and id namespace