Improved handling of widgets
Update Travis matrix