More tweaks to timeline