Integrate 2D design

Some files had to be moved from common to 3D because of minor differences