Fixed history and back/forward