BaseActiveTrackActivity refactoring