refactor of css, better style