improve UI + fix a bug on History