Added safe-room view