Issue #231 scenario button fixes