Add folder contents and fix navigation settings view