Improve layout and performance