#152 continued working on data modal