Finish 5.5 layout and routers