Update 7 - GUI renaming, minor fixes