Feat/css refactor

Feat/css refactor