fix style, add watch button