Improve layout and work around timing issues