Added names to widgets