Fix modal & chooseAddress