Revert "Revert "Minor scene changes.""

This reverts commit a64a80d3453edfb43f9c39c96db20fda25559d8a.