synced my branch with master

added stuff to navigation aswell need to talk to connor about it