Popup block

Re added the commits we want.