Improve layout organization