Reworked on Css