Rescue everything
Correcting merge
Fixes navigation, removes unneeded sourcemap