Improve nav to be more responsive