fix locked and tags models
add text content pop up
Merge pull request #119 from olslash/feat/createscreenrefator

Feat/createscreenrefator