Fix solution file and add it
Rename many widgets; fix comment typo