Improve the behavior when closing

Actually close the view instead of going back, this way it actually
has an impact when two views are shown