GUI added, minor bugfix