add history & ui small refactoring