scenes; little component refactor