cleaned up navbar and fixed bugs
Merge branch 'Dashboard' of https://github.com/STCTbone/friendkarma into Dashboard