Added improvements to history navigation