Restructure for and add option to delete entry from history.