rework of the css and more