Tools panel and some small rearrangements