Improved async end handling + refactored table auto hiding/showing.