fixed some ui and navigation issues
Merge pull request #14 from seancavanaugh/UI_and_Navigation_fixes

fixed some ui and navigation issues