Merging view changes and fixing invalid view name