Added modal reply popup
Merged changes