Recommiting previous changes for GUI, copyright and codecleanup