Fix server view nav
Re-organise dashboard and server views