US #59 Plugin cleanup
US #71 change configuration for widgets