Improve layout spacing