Rework history page