finished layout and new routing