Manually merged changes in the layout
Fixed leftover-stuff in the layout-migration