Added ability to have sub-folders displayed properly