Feat/bookmark drawcomponent