room-view refactor