Updated view handling