More views and other minors changes
Many views completed