fix some layout problem