Put trek identity and toolbox on the right (ref #238)

(we miss you @Grsmto...)