The gui can now be restarted without any problems. Some TODO's have been additionally hacked up

Signed-off-by: Patrick Meppe <tapmeppe@gmail.com>