layout rework :metal: