removed lifesaver, reordered nav items