Refact/tabrefresh