Fixes #1

Added additional looping to show contained folders as well as favourites within the top level folder