Refactor and css

Refactor and add css classes