Finish layout and routes fixed