add shims
Finish layout and routes