Refactor/design system#15

dgd03146 wants to merge 2 commits intodevelopTEAM-MAMO/mamo:developfrom

refactor/design-systemTEAM-MAMO/mamo:refactor/design-systemCopy head branch name to clipboard