Finish add layout and routes