Views added, some corrections in models

First sketch of the views, some additions to models.
Merging with Master

My own branch merged with Master