Export view improved