Finish layout and modify routes