bug fix and css fix