Finish Layout and Routes
Merge pull request #2 from aasifkhan/filling-in-layout

Finish Layout and Routes