fixed modal double submission, need js enhancement and refactoring