Clean up; added closing button on the showing aggregate window