Focus bug fixed in navigation