refactor scene selection feature complete