Added timer and edge case for when test is completed (still need to decide what to do when finished). Also changed some colors to work with Andy's change to theme.