Tools tab in the Creative Inventory is starting to get messy again

With adition of new items in the Tools tab in the creative inventory, it is getting messy, chaotic and it's unorganized. Some time ago, the arrangement after material-based tools was that there were other tools (Compass, Shears, Name Tag, etc.) and then the Enchanting Books. Spyglass and Bundle (now with Lead and Name Tag too), which have now been added, did not respect anything and the arrangement just don't make sence. The Bundle is even among some earlier tools for some reason.