More design improvments.