Fix bug for when it moves to different size screen it uses a different image
Merge branch 'master' into gh-pages