Remove nagivate edit fragement & add push state