More design tidying.