Refactor, polish collapsed menu links