Bug/75/js cards

Some js cards fixes :dancer: