Began adding close events (need to fix zombie views)