Feat/yarn view