Finished fixin' up the new nav editor