try to merge ui
merge customer part view
merge ui temporary complete
merge from master