merge design part to master

Merged SIPEIQI requested to merge design into master