Made good progress with the layout and routes