Improve popup and draggable