Design updates
merge dist
merge dist