updates to views
veiw updates and merge