add css
merge logig and css