now with close view working