Adding javascript classes and few little changes