Fix some nav issues