done with navigation with animation
fixed merge