Organize a bit and add tooltips