cleaning up watch grid / focus