Finish layout and routes UPDATE