Finish layout and routesV2