More GUI work

Running into some issues with how we handle cards, making things
difficult...