Merge pull request #35 from paulcox24/Cards

Fixed navbar bug
Fixed location bug