Merged the existing code with the new GUI code
- at first glance merge seems to be succesfull, everything GUI related
works now