ENH FIX: Better buttons + removed deprecated functions + link to TOC