No.3 for e8eafc12

Code-Change & fix popup position