Improved timeline and overall spaces