GUI improvements, changed some names into more conventional