Updated to work with Folders and Books

and added event so views can update too