Organizing tunnels

Labels, groups, custom icons and sort order.