Fixed card adding; some design work.