Datatools layout updates