Finish layout and add routes