fix some layout problem
fix some layout problem