Cleanup layout, after soring #2.
Layout sorted, re-slashed.