Widgets directives some fixes