Minor cleanup
Changed back to using widgets from the database.