more design fixes