removed card-box div
merged from master