Improve layout for synchronization