More GUI work for #43