Improve watch
Improve CSS