Better category handling, hovering table