Bugg fix and css clean