Adds nav improvements