Finishing up layout and routes