changes to images and screen structure
Merge remote-tracking branch 'origin/master'
changes to images