fixed split nav and collapse problem #6 & #7