better ordering and turn tooltips back on