[HistoryMenu] Improvements