Issue #50: reordered/renamed tools menu