More design improvements.