changed card box styling
fixed merge conflict