Fixed #4 and #14

Tried to fix issue with text changed on screen rotation. needs more
time..