Update finish layout and routes