bug fix & css fix