removed text because it was causing problems with offset and set overflow hidden
moved text to onscreen
Merge branch 'dev'