View bug fixes
View bug fixes