fix some layout