Much improvements to the history table