fixing margin issue
fixing card templates