fix some layouyt problem