Cleanup and fix first/last team bubbles cutoff