Card UI improvements & testing