add some design ups
fix merge