more frontend work
Merge remote-tracking branch 'origin/master'
started with the card rendering
Merge remote-tracking branch 'origin/master'