slightly improve layout