fix some problem with design