Cleaning the views folder. Some modifications