improved GUI, bugfixes