(chore) Remove default layout and use new layout