fix some bugs, changes on Proceed to show alert only once