Filled in layout and updated routes and tests