Revamp dynamic layouts