Fix main viewers