Changed navigation to support multiplaying