Litle refactoring. To fix: text moving