Add class for styles
fixing bugs