added modal and fixed