bug fix of wathermark + added active state of spinner