Close child views automagically

Very good points. Will make the update.