Finish layout and update routes