- Add class parameter to widget

- Clean up sloppy tpl coding