Added colapsable folders feature