Fixing tracking of active site and nav display based on it