design fixes
quickfix