Edited and added new views
Some models modified
Same