update for velocity layout and toolbox