Update from Skyron

Added 3 level of navigation through json...