add godray ui
merge