More image and help tuning
Merge branch 'staging'