fix watch/unwatch buttons
make status selection a drop-down