Scoped edit functions and tweaked nav