Updated folder displaying code with changes we discussed on list