Feat/design guideline