added min-height for watcher & other watcher fixes