Minor UI fix
Fixed thread syncronization issues. Minor fixes.

Also, everytime a plugin activates, the watermark will change according to its name.