Duplicates changes from "Timeline controls scaling correctly"
Duplicates commit: 9436669f90b816399c60ec808053db55826358a6
Duplicates previous commits (so they work on Katie's computer)