design fixes
fixes