Added modal related stuff
Added modal related stuff