Changed navigation, fixed issue