Add shims
more layout work
Finish layout and routes