Refactor and css

Refactor and added css classes