change some layout issue