Navigation Changes/Minor code refactoring
Merge branch 'master' of github.com:keeronmarc/Mobber
Index updated with new nav