Build road toolbar split and various fixes