restored tooltips in new layout