Improve layout performance. thanks lint