CON-1448 | Global Navigation fixes for enters