design-fixes