refactoring + css