Bugs Fixed , Data Modal Window removed