Tweaking popup with some more location options