Navigation improvement
Also several improvements to the updating of content