Updated activity tracking to be more precise and display current activity