Finish layout and Routes pt2