Added ability to add a folder and a few other changes to views