Finishing widget renaming. Minor fixes