Adding the text div
Merge branch 'dev'