Refurbish layout and routes work