extract toolbar helper + add follow component