Inter-doc navigation + some minor changes