Fix up continuous timer, use team timer spacing throughout