Fixes and new widgets