Improve layout and time information.