Defect fixes, minor changes to View