fix view handling