Finish some layout and route fixing