Add view updates
Clean up