Better card management

This has already been suggested. Vote for it here.