Shift start time AND end time. Fix in keywords highlighting. Some cleanup