Updated time tracker
More changes to time tracker