bug fix & layout modified