initial fix implementation of text-not-moving-inside-border issue