Progress on layouts and routes