Finished layout and updated routes