Improve nav selector