edit name + fix up navigation