the size of the character does not depend on the size of the screen
Fixed merge conflicts
Position of character improved