Skip to toolbar

Better performance, better recovery