Organized code & fixed timeline controls