Merge "Changed navigation handle to be longer and removed assistant handle"