Fixed tap crew select, modified buttons for demo