Merged new design into /new folder