Minor updates to scene layout