Minor tweaks, navigation to subfolders is still not working