New Layout, Separated the old and new