Fixed bugs related to tracker view