added settings and redid hisory in popover
added settings and redid hisory in popover