design fixes