Some code-cleanup and GUI-improvements.