Added cascading navigation + various other fixes.