[History] Improve journal and journal entry

All is in the title :kiss: