feature/design-polish