Tooltips, outline and tweaks