Add design stuff
Remove duplicate commit
Add design stuff
Merge branch 'design_pic' into develop