Cleanup and fixed String comparison
Improved updates of the Semantics
Show Delete-Button