Started to integrate new design
Fix conflict