Scene inspector improvements

This one should hopefully take care of #894 and #197.