view manager and close events
removed stray comment
fixed conflicts
Merge pull request #357 from CalvinFernandez/view-manager

view manager and close events