fix bug and css