Updating views
Updates and fixes