Added some tables and some smaller changes in views