Upgrade layout and routes