Adding History page & fixing tracking user