Minor changes
Add option to set widget type