Issue #1
Refactoring of the GUI generation