Minor changes
Exception handling
Views initials