added watch icon
added configurable units