refactoring css and some features