history tab merging in progress...

Wanted just to send this PR even if not finished because I've already done something and I'll not have time till next week to work on it.