History and menu fix