added widgets and fixed DOM classnames