fixed small view bugs
added switch for screenshot generating
Merge remote-tracking branch 'origin/master'