Added navigation improvements.