Make toolbox forwarding works with new layout