improve gui, clean up sources