Merge pull request #1 from leooob/master

Added new images
Deactivate goto main screen directly
fixed conflicts