Fix Watch
Fix modal close
Fix modal close