Finish tidy up of program timeline screen switching