Fix History UI Bugs