Added Views
Merge origin/master
Adding Sort of items
Adding Sort of items