added show modal for a card
resloved conflicts
added modal setup and fixed some errors