More fixes to card positioning

Starting to look really good!