Finished up layouts and routes