Feature/replace navigation