finish layout and routes again