Change in plugin and widget view

More reusable