Added more device support and a sleek way to select a stage.