visual tweaks and flow

This should be bypassed if on autopilot!