Tweak scene parameters and layouts, update demo2