Finished layout and routes
merge branch 'filling-in-layout'

not sure whats going on now