Updated blocks and javascript for diagnostic navigation 2