Fleshed out layout and Finish routes