More todo!
Fiddeling with the GUI