Signaltap Signal Groups

Having the address and data as buses and the strobes separate is fine. What isn't fine by me, is having one huge mono-colored list of potentially unrelated signals such as the following:

address[31:1]

data[31:0]

data_strobe

addr_strobe

multiplier_out[31:0]

button_in

i2c_line

fifo_data[31:0]

fifo_write_enable

fifo_clk

You see how it all bunches together? These are not all related. I want to be able to relate the first four items together, and the last three, etc.