fix timestamps, improve layout