Navigation and other tweaks