Added navbar
Restructured.  Got some things working