More nav tweaks, colours