Behavior should be very similar but the code is simplified and it should fix various bugs where the card was showing out of screen even if we had available space.