navigation tweaks and network fix