design fixes
merge