Minor adaptions to scaffold, to reflect the new way of layouting.