More design improvements