Popup Fix

We have changed our popup design & bug fixes.